fixed icon rules so gtkbuiltincache.h is only rebuilt if needed.

2005-11-12  Michael Natterer  <mitch@imendio.com>

	* gtk/Makefile.am: fixed icon rules so gtkbuiltincache.h is only
	rebuilt if needed.

diff --git a/ChangeLog b/ChangeLog
index de8101264f9c3081839f36f76a3179e6e97c76d2..4937b37f67b3770ede77b7982b53c23f00cfc5e2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-12  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/Makefile.am: fixed icon rules so gtkbuiltincache.h is only
+       rebuilt if needed.
+
 2005-11-12  Dom Lachowicz <cinamod@hotmail.com>
 
        * modules/engines/ms-windows/msw_style.c: Bug #313627. Make win32 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index de8101264f9c3081839f36f76a3179e6e97c76d2..4937b37f67b3770ede77b7982b53c23f00cfc5e2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-11-12  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/Makefile.am: fixed icon rules so gtkbuiltincache.h is only
+       rebuilt if needed.
+
 2005-11-12  Dom Lachowicz <cinamod@hotmail.com>
 
        * modules/engines/ms-windows/msw_style.c: Bug #313627. Make win32 

diff --git a/gtk/.cvsignore b/gtk/.cvsignore
index 93103004655cd9c89938fbacb5cc6df5cdd333e6..875645e461e64d40a597a8673a441ea4ffef8397 100644 (file)
--- a/gtk/.cvsignore
+++ b/gtk/.cvsignore
@@ -21,6 +21,7 @@ testdnd
 stamp-gtktypebuiltins.h
 stamp-gtkmarshal.h
 stamp-gtkmarshalers.h
+stamp-icons
 gtk-query-immodules-2.0
 .saved
 gtkalias.h

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index bb5b851affd82e2c70d4c0d4ab67415ea84bf529..c6a1f01e80e52e0c8dcac73df44f7ca52a900d78 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -739,7 +739,7 @@ gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API
 
 gtk_update_icon_cache_SOURCES = updateiconcache.c
 
-.PHONY: files test test-debug icons
+.PHONY: files test test-debug
 
 files:
        @files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
@@ -765,15 +765,11 @@ STOCK_ICONS = \
        stock-icons/16/gtk-floppy.png                   \
        stock-icons/16/gtk-fullscreen.png               \
        stock-icons/16/gtk-go-back-ltr.png              \
-       stock-icons/16/gtk-go-back-rtl.png              \
        stock-icons/16/gtk-go-down.png                  \
        stock-icons/16/gtk-go-forward-ltr.png           \
-       stock-icons/16/gtk-go-forward-rtl.png           \
        stock-icons/16/gtk-goto-bottom.png              \
        stock-icons/16/gtk-goto-first-ltr.png           \
-       stock-icons/16/gtk-goto-first-rtl.png           \
        stock-icons/16/gtk-goto-last-ltr.png            \
-       stock-icons/16/gtk-goto-last-rtl.png            \
        stock-icons/16/gtk-goto-top.png                 \
        stock-icons/16/gtk-go-up.png                    \
        stock-icons/16/gtk-harddisk.png                 \
@@ -790,17 +786,13 @@ STOCK_ICONS = \
        stock-icons/16/gtk-justify-right.png            \
        stock-icons/16/gtk-leave-fullscreen.png         \
        stock-icons/16/gtk-media-forward-ltr.png        \
-       stock-icons/16/gtk-media-forward-rtl.png        \
        stock-icons/16/gtk-media-next-ltr.png           \
-       stock-icons/16/gtk-media-next-rtl.png           \
        stock-icons/16/gtk-media-pause.png              \
        stock-icons/16/gtk-media-play-ltr.png           \
        stock-icons/16/gtk-media-play-rtl.png           \
        stock-icons/16/gtk-media-previous-ltr.png       \
-       stock-icons/16/gtk-media-previous-rtl.png       \
        stock-icons/16/gtk-media-record.png             \
        stock-icons/16/gtk-media-rewind-ltr.png         \
-       stock-icons/16/gtk-media-rewind-rtl.png         \
        stock-icons/16/gtk-media-stop.png               \
        stock-icons/16/gtk-missing-image.png            \
        stock-icons/16/gtk-network.png                  \
@@ -819,7 +811,6 @@ STOCK_ICONS = \
        stock-icons/16/gtk-revert-to-saved-ltr.png      \
        stock-icons/16/gtk-revert-to-saved-rtl.png      \
        stock-icons/16/gtk-save-as.png                  \
-       stock-icons/16/gtk-save.png                     \
        stock-icons/16/gtk-select-all.png               \
        stock-icons/16/gtk-select-font.png              \
        stock-icons/16/gtk-sort-ascending.png           \
@@ -871,9 +862,7 @@ STOCK_ICONS = \
        stock-icons/24/gtk-go-down.png                  \
        stock-icons/24/gtk-goto-bottom.png              \
        stock-icons/24/gtk-goto-first-ltr.png           \
-       stock-icons/24/gtk-goto-first-rtl.png           \
        stock-icons/24/gtk-goto-last-ltr.png            \
-       stock-icons/24/gtk-goto-last-rtl.png            \
        stock-icons/24/gtk-go-up.png                    \
        stock-icons/24/gtk-harddisk.png                 \
        stock-icons/24/gtk-help.png                     \
@@ -890,17 +879,13 @@ STOCK_ICONS = \
        stock-icons/24/gtk-justify-right.png            \
        stock-icons/24/gtk-leave-fullscreen.png         \
        stock-icons/24/gtk-media-forward-ltr.png        \
-       stock-icons/24/gtk-media-forward-rtl.png        \
        stock-icons/24/gtk-media-next-ltr.png           \
-       stock-icons/24/gtk-media-next-rtl.png           \
        stock-icons/24/gtk-media-pause.png              \
        stock-icons/24/gtk-media-play-ltr.png           \
        stock-icons/24/gtk-media-play-rtl.png           \
        stock-icons/24/gtk-media-previous-ltr.png       \
-       stock-icons/24/gtk-media-previous-rtl.png       \
        stock-icons/24/gtk-media-record.png             \
        stock-icons/24/gtk-media-rewind-ltr.png         \
-       stock-icons/24/gtk-media-rewind-rtl.png         \
        stock-icons/24/gtk-media-stop.png               \
        stock-icons/24/gtk-missing-image.png            \
        stock-icons/24/gtk-network.png                  \
@@ -940,9 +925,6 @@ STOCK_ICONS = \
        stock-icons/24/gtk-zoom-in.png                  \
        stock-icons/24/gtk-zoom-out.png                 \
        stock-icons/24/gtk-go-forward-ltr.png           \
-       stock-icons/24/gtk-go-forward-rtl.png           \
-       stock-icons/24/gtk-go-back-rtl.png              \
-       stock-icons/24/gtk-save.png                     \
        stock-icons/32/gtk-dnd-multiple.png             \
        stock-icons/32/gtk-dnd.png                      \
        stock-icons/48/gtk-dialog-authentication.png    \
@@ -951,36 +933,59 @@ STOCK_ICONS = \
        stock-icons/48/gtk-dialog-question.png          \
        stock-icons/48/gtk-dialog-warning.png
 
-icons:
+GENERATED_ICONS = \
+       stock-icons/16/gtk-go-back-rtl.png              \
+       stock-icons/16/gtk-go-forward-rtl.png           \
+       stock-icons/16/gtk-goto-first-rtl.png           \
+       stock-icons/16/gtk-goto-last-rtl.png            \
+       stock-icons/16/gtk-media-forward-rtl.png        \
+       stock-icons/16/gtk-media-next-rtl.png           \
+       stock-icons/16/gtk-media-previous-rtl.png       \
+       stock-icons/16/gtk-media-rewind-rtl.png         \
+       stock-icons/16/gtk-save.png                     \
+       stock-icons/24/gtk-go-back-rtl.png              \
+       stock-icons/24/gtk-go-forward-rtl.png           \
+       stock-icons/24/gtk-goto-first-rtl.png           \
+       stock-icons/24/gtk-goto-last-rtl.png            \
+       stock-icons/24/gtk-media-forward-rtl.png        \
+       stock-icons/24/gtk-media-next-rtl.png           \
+       stock-icons/24/gtk-media-previous-rtl.png       \
+       stock-icons/24/gtk-media-rewind-rtl.png         \
+       stock-icons/24/gtk-save.png
+
+stamp-icons: $(STOCK_ICONS)
        for i in 16 24; do                                                      \
-          (cd stock-icons/$$i                                                  \
+          (cd $(srcdir)/stock-icons/$$i                                        \
           && rm -f gtk-go-back-rtl.png                                         \
           && $(LN_S) gtk-go-forward-ltr.png gtk-go-back-rtl.png                \
           && rm -f gtk-go-forward-rtl.png                                      \
           && $(LN_S) gtk-go-back-ltr.png gtk-go-forward-rtl.png                \
-          && rm -f gtk-goto-last-rtl.png                                       \
-          && $(LN_S) gtk-goto-first-ltr.png gtk-goto-last-rtl.png              \
           && rm -f gtk-goto-first-rtl.png                                      \
           && $(LN_S) gtk-goto-last-ltr.png gtk-goto-first-rtl.png              \
-          && rm -f gtk-media-rewind-rtl.png                                    \
-          && $(LN_S) gtk-media-forward-ltr.png gtk-media-rewind-rtl.png        \
+          && rm -f gtk-goto-last-rtl.png                                       \
+          && $(LN_S) gtk-goto-first-ltr.png gtk-goto-last-rtl.png              \
           && rm -f gtk-media-forward-rtl.png                                   \
           && $(LN_S) gtk-media-rewind-ltr.png gtk-media-forward-rtl.png        \
-          && rm -f gtk-media-previous-rtl.png                                  \
-          && $(LN_S) gtk-media-next-ltr.png gtk-media-previous-rtl.png         \
           && rm -f gtk-media-next-rtl.png                                      \
           && $(LN_S) gtk-media-previous-ltr.png gtk-media-next-rtl.png         \
+          && rm -f gtk-media-previous-rtl.png                                  \
+          && $(LN_S) gtk-media-next-ltr.png gtk-media-previous-rtl.png         \
+          && rm -f gtk-media-rewind-rtl.png                                    \
+          && $(LN_S) gtk-media-forward-ltr.png gtk-media-rewind-rtl.png        \
           && rm -f gtk-save.png                                                \
-          && $(LN_S) gtk-floppy.png gtk-save.png                               \
-          && cd ../..)                                                         \
-       done
+          && $(LN_S) gtk-floppy.png gtk-save.png)                              \
+       done                                                                    \
+       && touch stamp-icons
 
-gtkbuiltincache.h: @REBUILD@ gtk-update-icon-cache$(EXEEXT) icons
+gtkbuiltincache.h: @REBUILD@ gtk-update-icon-cache$(EXEEXT) stamp-icons
        ./gtk-update-icon-cache --force --ignore-theme-index    \
           --source builtin_icons stock-icons > gtkbuiltincache.h
 
+MAINTAINERCLEANFILES += stamp-icons
+
 EXTRA_DIST +=                   \
        $(STOCK_ICONS)          \
+       $(GENERATED_ICONS)      \
        line-arrow.xbm          \
        line-wrap.xbm           \
        tree_plus.xbm           \